[release/13.2] Fix TS AppHost restore config resolution#15625
Merged
joperezr merged 2 commits intorelease/13.2from Mar 27, 2026
Merged
[release/13.2] Fix TS AppHost restore config resolution#15625joperezr merged 2 commits intorelease/13.2from
joperezr merged 2 commits intorelease/13.2from
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
sebastienros
requested review from
JamesNK,
adamint,
danegsta,
davidfowl,
eerhardt,
karolz-ms,
mitchdenny and
radical
as code owners
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 15625Or
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 15625" |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
|
🎬 CLI E2E Test Recordings — 52 recordings uploaded (commit View recordings
📹 Recordings uploaded automatically from CI run #23622073442 |
JamesNK
approved these changes
Mar 26, 2026
Member
JamesNK
left a comment
JamesNK
left a comment
There was a problem hiding this comment.
Nothing blocking. Some areas for improvement
|
|
||
| Assert.Equal("pr-new", channel); | ||
| } | ||
|
|
Comment on lines
+338
to
+339
| var channelName = AspireConfigFile.Load(_appDirectoryPath)?.Channel | ||
| ?? AspireJsonConfiguration.Load(_appDirectoryPath)?.Channel; |
Member
There was a problem hiding this comment.
This is duplicated in DotNetBasedAppHostServiceProject. Is there a place we could put a helper method to avoid duplication?
| config.Channel = inputs.Channel; | ||
| config.Save(outputPath); | ||
| } | ||
| config.Channel = inputs.Channel; |
Member
There was a problem hiding this comment.
nit: Write a log message that channel has been set. Could be the comment above here
Comment on lines
+224
to
+228
| var method = typeof(PrebuiltAppHostServer).GetMethod("ResolveChannelNameAsync", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); | ||
| Assert.NotNull(method); | ||
|
|
||
| var channelTask = Assert.IsType<Task<string?>>(method.Invoke(server, [CancellationToken.None])); | ||
| var channel = await channelTask; |
Member
There was a problem hiding this comment.
Why reflection and not make the method internal?
There is also reflection in Constructor_UsesUserAspireDirectoryForWorkingDirectory test
adamint
approved these changes
Mar 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
aspire newfor TypeScript AppHost projects was already triggering restore, but some of the first-run restore/code generation paths still read legacy.aspire/settings.jsoninstead of theaspire.config.jsonthat new templates produce. As a result, project-local channel and package resolution settings could be missed until a lateraspire restoreoraspire run.This change updates the TypeScript starter and guest AppHost server preparation paths to prefer
aspire.config.jsonwith legacy fallback preserved. It also persists the template SDK version before the automatic restore/code generation step so the initial generated project resolves integrations against the same version it was created with.The test updates cover the new-format config path in the starter flow and in both generated and prebuilt AppHost server channel resolution behavior.
Fixes #15413
Validation:
./dotnet.sh test tests/Aspire.Cli.Tests/Aspire.Cli.Tests.csproj -- --filter-method "*.NewCommandWithTypeScriptStarterGeneratesSdkArtifacts" --filter-method "*.CreateProjectFiles_NuGetConfig_UsesProjectLocalChannel_NotGlobalChannel_MatchesSnapshot" --filter-method "*.ResolveChannelNameAsync_UsesProjectLocalAspireConfig_NotGlobalChannel" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"./dotnet.sh test tests/Aspire.Cli.Tests/Aspire.Cli.Tests.csproj -- --filter-class "*.NewCommandTests" --filter-class "*.AppHostServerProjectTests" --filter-class "*.PrebuiltAppHostServerTests" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"Checklist
<remarks />and<code />elements on your triple slash comments?aspire.devissue: